messageTray: Remove overlaid close button

The new notification banner already includes a close button, so remove
the one provided by the tray.

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 18a1daf32800c34d7bacaa1464311f48a8d2e7a1..81d8412adcecd37d116ad4b91a68deb6352b1879 100644 (file)
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1499,11 +1499,6 @@ const MessageTray = new Lang.Class({
         this._banner = null;
         this._bannerClickedId = 0;
 
-        this._closeButton = Util.makeCloseButton();
-        this._closeButton.hide();
-        this._closeButton.connect('clicked', Lang.bind(this, this._closeNotification));
-        this.actor.add_actor(this._closeButton);
-
         this._userActiveWhileNotificationShown = false;
 
         this.idleMonitor = Meta.IdleMonitor.get_core();
@@ -1529,7 +1524,6 @@ const MessageTray = new Lang.Class({
 
         Main.layoutManager.trayBox.add_actor(this.actor);
         Main.layoutManager.trackChrome(this.actor, { affectsInputRegion: true });
-        Main.layoutManager.trackChrome(this._closeButton);
 
         global.screen.connect('in-fullscreen-changed', Lang.bind(this, this._updateState));
 
@@ -1566,14 +1560,6 @@ const MessageTray = new Lang.Class({
         this._updateState();
     },
 
-    _closeNotification: function() {
-        if (this._notificationState == State.SHOWN) {
-            this._closeButton.hide();
-            this._notification.emit('done-displaying');
-            this._notification.destroy();
-        }
-    },
-
     get queueCount() {
         return this._notificationQueue.length;
     },
@@ -2038,7 +2024,6 @@ const MessageTray = new Lang.Class({
         if (notification.isTransient)
             notification.destroy(NotificationDestroyedReason.EXPIRED);
 
-        this._closeButton.hide();
         this._pointerInNotification = false;
         this._notificationRemoved = false;